Still working on getting the system working. Nearing release, and one

Still working on getting the system working.  Nearing release, and one little
xpm bug to hunt down still.

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index eb05ce77def8c155b7bc637a7872217ee58d9098..306e617047b2edbab664c4d5ce38f49a06ace12e 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -1,18 +1,32 @@
-common_ldflags = -aviod-version
+
+lib_LTLIBRARIES =              \
+       libgdk_pixbuf.la
+
+libexecdir = $(libdir)/gdk-pixbuf/loaders
+
+libexec_LTLIBRARIES =          \
+       libpixbuf-png.la        \
+       libpixbuf-jpeg.la       \
+       libpixbuf-gif.la        \
+       libpixbuf-xpm.la        \
+       libpixbuf-tiff.la
+
 noinst_PROGRAMS = testpixbuf
-loader_dir=$(libdir)/gdk-pixbuf/loaders
-DEFS = -DPIXBUF_LIBDIR="$(loader_dir)"
-DEPS = libgdk-pixbuf.la
-LDADDS = libgdk-pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@
+DEPS = libgdk_pixbuf.la
+INCS = $(GNOME_INCLUDEDIR)
+DEFS = "-DPIXBUF_LIBDIR=\"$(libexecdir)\""
+LDADDS = libgdk_pixbuf.la @GNOME_LIBDIR@ @GNOMEUI_LIBS@
 
 testpixbuf_DEPENDENCIES = $(DEPS)
 testpixbuf_LDADD = $(LDADDS)
-testpixbuf_CFLAGS = $(GNOME_INCLUDEDIR)
+testpixbuf_INCLUDES = $(INCS)
+testpixbuf_CFLAGS = $(GNOME_INCLUDEDIR) $(DEFS)
 
 #
 # The GdkPixBuf library
 #
-libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf $(GNOME_INCLUDEDIR)
+libgdk_pixbufincludedir = $(includedir)/gdk-pixbuf
+libgdk_pixbuf_CFLAGS = $(GNOME_INCLUDEDIR) -I$(top_builddir) -I$(top_srcdir)
 
 libgdk_pixbuf_la_SOURCES =     \
        gdk-pixbuf.c            \
@@ -25,44 +39,32 @@ libgdk_pixbufinclude_HEADERS =      \
 # The PNG plugin.
 #
 libpixbuf_png_la_SOURCES = io-png.c
-libpixbuf_png_la_LDFLAGS = $(common_ldflags)
-libpixbuf_png_la_LIBADD = $(PNGLIBS)
+libpixbuf_png_la_LDFLAGS = -avoid-version
+libpixbuf_png_la_LIBADD = $(LIBPNG)
 
 #
 # The JPEG loader
 #
 libpixbuf_jpeg_la_SOURCES = io-jpeg.c
-libpixbuf_jpeg_la_LDFLAGS = $(common_ldflags)
-libpixbuf_jpeg_la_LIBADD = $(JPEGLIBS)
+libpixbuf_jpeg_la_LDFLAGS = -avoid-version
+libpixbuf_jpeg_la_LIBADD = $(LIBJPEG)
 
 #
 # The XPM loader
 #
 libpixbuf_xpm_la_SOURCES = io-xpm.c
-libpixbuf_xpm_la_LDFLAGS = $(common_ldflags)
-libpixbuf_xpm_la_LIBADD =
-
+libpixbuf_xpm_la_LDFLAGS = -avoid-version
 
 #
 # The GIF loader
 #
 libpixbuf_gif_la_SOURCES = io-gif.c
-libpixbuf_gif_la_LDFLAGS = $(common_ldflags)
-libpixbuf_gif_la_LIBADD= $(GIFLIB)
+libpixbuf_gif_la_LDFLAGS = -avoid-version
+libpixbuf_gif_la_LIBADD = $(LIBGIF)
 
 #
 # The TIFF loader
 #
 libpixbuf_tiff_la_SOURCES = io-tiff.c
-libpixbuf_tiff_la_LDFLAGS = $(common_ldflags)
-libpixbuf_tiff_la_LIBADD = $(TIFFLIB)
-
-lib_LTLIBRARIES =               \
-        libgdk-pixbuf.la 
-
-libpixbufloader_DATA =         \
-       libpixbuf-tiff.la       \
-       libpixbuf-gif.la        \
-       libpixbuf-xpm.la        \
-       libpixbuf-jpeg.la       \
-       libpixbuf-png.la
+libpixbuf_tiff_la_LDFLAGS = -avoid-version
+libpixbuf_tiff_la_LIBADD = $(LIBTIFF)